Minor bug fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30267b13b9f75417c87a6cec4b6116a6fef163a1..3a02fd5cdb0ab2b480e0d186e90a91489a0f6ed8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+<<<<<<< TREE
+2014-01-09  Eric S. Raymond  <esr@thyrsus.com>
+
+       * vc/vc-git.el (vc-git-print-log): Add --follow option to command,
+       following renames and addressing Debian bug 8756.
+
 2014-01-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * simple.el (deactivate-mark, activate-mark): Force-mode-line-update

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 06e46eeb663542e5eb1baf6c67e78bac93d55473..6706300a3772adcdb7331c5506558d4ee06f7145 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -791,7 +791,7 @@ If LIMIT is non-nil, show no more than this many entries."
        (apply 'vc-git-command buffer
               'async files
               (append
-               '("log" "--no-color")
+               '("log" "--no-color" "--follow")
                (when shortlog
                  `("--graph" "--decorate" "--date=short"
                     ,(format "--pretty=tformat:%s"